Add BINDIR. Use it.

Signed-off-by: Bastian Blank <waldi@debian.org>

diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 4230923d4e2307a8af01de6263c30941bdb2ec70..dd9e62c4646118e65ba5ae160d36790bee77f5ef 100644 (file)
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -18,6 +18,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
+BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib64

diff --git a/config/SunOS.mk b/config/SunOS.mk
index a76891b3815f87dfc9d1eecb8b0bb2a714d78293..7f11d4d9dc1c524dcbd8215705974479c3d8fd63 100644 (file)
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -19,6 +19,7 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
+BINDIR = $(PREFIX)/bin
 INCLUDEDIR = $(PREFIX)/include
 LIBDIR = $(PREFIX)/lib
 LIBDIR_x86_64 = $(PREFIX)/lib/amd64

diff --git a/tools/debugger/xenitp/Makefile b/tools/debugger/xenitp/Makefile
index 42be8f34c92ec19be80daf8fafdbcbc51f17ac15..94c61fde99464d5c14f1e9ede60952f07f5ae6ea 100644 (file)
--- a/tools/debugger/xenitp/Makefile
+++ b/tools/debugger/xenitp/Makefile
@@ -26,13 +26,13 @@ build: $(BIN) $(LIBBIN)
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
+       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
        [ -d $(DESTDIR)/usr/share/man/man1 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
        [ -d $(DESTDIR)/usr/share/man/man8 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
-       $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
+       $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
        $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
        $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8

diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index c5a1283a9ea9bcb7cdca535477b8b49d7aaaea6e..07981efffbe8f96e86dad97967289b2e52bf5efa 100644 (file)
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -60,7 +60,7 @@ iasl:
        wget $(IASL_URL)
        tar xzf $(IASL_VER).tar.gz
        make -C $(IASL_VER)/compiler
-       $(INSTALL_PROG) $(IASL_VER)/compiler/iasl /usr/bin/iasl
+       $(INSTALL_PROG) $(IASL_VER)/compiler/iasl $(DESTDIR)$(BINDIR)/iasl
 
 acpi.a: $(OBJS)
        $(AR) rc $@ $(OBJS)

diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index f9dcbb22ad653a3b58d622d73305e45e7c0486f0..d4bde6be971b910bdf25d6fe53daa8ad08545c7f 100644 (file)
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -29,9 +29,9 @@ build: $(TARGETS)
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
+       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
+       $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
        $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
 

diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile
index 77ba4f80df738a225659de0cfceb76018148b6e3..7eafce16e51ce4b6b5ffccef35b718ad1835ed9e 100644 (file)
--- a/tools/misc/lomount/Makefile
+++ b/tools/misc/lomount/Makefile
@@ -16,7 +16,7 @@ build: $(BIN)
 
 .PHONY: install
 install install-recurse: build
-       $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
+       $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
 
 .PHONY: clean
 clean:

diff --git a/tools/misc/miniterm/Makefile b/tools/misc/miniterm/Makefile
index ec063746f48d47ac07cd15b397860fe75803afce..116ef1f6b32a6c01938328308c2b6a0ffe0bcae5 100644 (file)
--- a/tools/misc/miniterm/Makefile
+++ b/tools/misc/miniterm/Makefile
@@ -8,8 +8,8 @@ all: $(TARGET)
 
 .PHONY: install
 install: all
-       [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
-       $(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
+       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROG) $(TARGET) $(DESTDIR)$(BINDIR)
 
 .PHONY: install-recurse
        : No sense in installing miniterm on the Xen box.

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 2652b1e3ec464772dfdd5b30ff3aa0d18a291fa6..ab8cd1e8fc55a70144ffb2bc54fef935ade6eb80 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -81,13 +81,13 @@ tarball: clean
 install: all
        $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
        $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
-       $(INSTALL_DIR) $(DESTDIR)/usr/bin
+       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        $(INSTALL_DIR) $(DESTDIR)/usr/sbin
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
-       $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
-       $(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
-       $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
+       $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROG) xenstore-ls $(DESTDIR)$(BINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 2032405c9e2c236b518c82f3f095a46d0cd6a572..5e46c9031017e175e698ce71d9c2229178f03eb7 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -35,13 +35,13 @@ build: $(BIN) $(LIBBIN)
 
 .PHONY: install
 install: build
-       [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
+       $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/xen/bin
        [ -d $(DESTDIR)/usr/share/man/man1 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man1
        [ -d $(DESTDIR)/usr/share/man/man8 ] || \
                $(INSTALL_DIR) $(DESTDIR)/usr/share/man/man8
-       $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)/usr/bin
+       $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
        [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBDIR)/xen/bin
        $(INSTALL_DATA) $(MAN1) $(DESTDIR)/usr/share/man/man1
        $(INSTALL_DATA) $(MAN8) $(DESTDIR)/usr/share/man/man8